bitkeeper revision 1.1159.1.409 (41938eb5R_aT_o7ziQIPb16yfl3SIg)

Calibrate delay loop on APs.

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c
index 846292b788ac86e5af5746d11c8eb0c1d18ab355..2c26fdb5b7dc1cfe8aaf83a8e97620e89103b4c5 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c
@@ -404,6 +404,7 @@ void __init smp_callin(void)
        smp_callin_clear_local_apic();
        setup_local_APIC();
        map_cpu_to_logical_apicid();
+#endif
 
        local_irq_enable();
 
@@ -411,7 +412,6 @@ void __init smp_callin(void)
         * Get our bogomips.
         */
        calibrate_delay();
-#endif
        Dprintk("Stack at about %p\n",&cpuid);
 
        /*
@@ -421,8 +421,8 @@ void __init smp_callin(void)
 
 #if 0
        disable_APIC_timer();
-       local_irq_disable();
 #endif
+       local_irq_disable();
        /*
         * Allow the master to continue.
         */